[IA64] vcpu hot-plug/remove for VTi

Return to SAL added for VTi by adding a new SAL (OEM defined) function.
Using this patch I was able to hot-add/hot-remove under linux (in fact
virtualized hot).

Signed-off-by: Tristan Gingold <tgingold@free.fr>

diff --git a/xen/arch/ia64/vmx/vlsapic.c b/xen/arch/ia64/vmx/vlsapic.c
index 4bc9ab5cc7e2755b02c6174b4cc1bf5bdd4231e5..979571620d1af60dfc843e3c45bdf81e2bd67386 100644 (file)
--- a/xen/arch/ia64/vmx/vlsapic.c
+++ b/xen/arch/ia64/vmx/vlsapic.c
@@ -672,7 +672,9 @@ static void vlsapic_write_ipi(VCPU *vcpu, uint64_t addr, uint64_t value)
     if (targ == NULL)
         panic_domain(NULL, "Unknown IPI cpu\n");
 
-    if (!test_bit(_VCPUF_initialised, &targ->vcpu_flags)) {
+    if (!test_bit(_VCPUF_initialised, &targ->vcpu_flags) ||
+        test_bit(_VCPUF_down, &targ->vcpu_flags)) {
+
         struct pt_regs *targ_regs = vcpu_regs(targ);
         struct vcpu_guest_context c;
 

diff --git a/xen/arch/ia64/xen/fw_emul.c b/xen/arch/ia64/xen/fw_emul.c
index 1a2f5b5173a3100bfdce5e4cd01c619b5800e0b2..8a4897deaf547a5a380c4c7259043788b1e07947 100644 (file)
--- a/xen/arch/ia64/xen/fw_emul.c
+++ b/xen/arch/ia64/xen/fw_emul.c
@@ -371,6 +371,10 @@ sal_emulator (long index, unsigned long in1, unsigned long in2,
            case SAL_UPDATE_PAL:
                printk("*** CALLED SAL_UPDATE_PAL.  IGNORED...\n");
                break;
+           case SAL_XEN_SAL_RETURN:
+               if (!test_and_set_bit(_VCPUF_down, &current->vcpu_flags))
+                       vcpu_sleep_nosync(current);
+               break;
            default:
                printk("*** CALLED SAL_ WITH UNKNOWN INDEX.  IGNORED...\n");
                status = -1;

diff --git a/xen/include/asm-ia64/dom_fw.h b/xen/include/asm-ia64/dom_fw.h
index fcf2cb5739caa2f5bc9aa7737c78434dedc95a1f..6dc204ebda7a03cdb23ff8d04f9a50ed57d0eba0 100644 (file)
--- a/xen/include/asm-ia64/dom_fw.h
+++ b/xen/include/asm-ia64/dom_fw.h
@@ -180,6 +180,9 @@
 
 #define EFI_MEMDESC_VERSION            1
 
+/* Additionnal OEM SAL.  */
+#define SAL_XEN_SAL_RETURN     0x02000000
+
 extern struct ia64_pal_retval xen_pal_emulator(u64, u64, u64, u64);
 extern struct sal_ret_values sal_emulator (long index, unsigned long in1, unsigned long in2, unsigned long in3, unsigned long in4, unsigned long in5, unsigned long in6, unsigned long in7);
 extern struct ia64_pal_retval pal_emulator_static (unsigned long);